Deprecate get_cell_renderers implementations

These have been superseded by gtk_cell_layout_get_cells.
Fixes bug 562335.

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 30a94cb15fdb1ab6f6235cf5efb1943b0183ffde..3ac0c38796fe268feca0641afbbc74cd83f62c2d 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -690,7 +690,9 @@ gtk_cell_renderer_toggle_set_radio
 
 #if IN_HEADER(__GTK_CELL_VIEW_H__)
 #if IN_FILE(__GTK_CELL_VIEW_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_cell_view_get_cell_renderers
+#endif
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_model
 gtk_cell_view_get_size_of_row
@@ -4602,7 +4604,9 @@ gtk_tree_view_column_clear_attributes
 gtk_tree_view_column_clicked
 gtk_tree_view_column_focus_cell
 gtk_tree_view_column_get_alignment
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_tree_view_column_get_cell_renderers
+#endif
 gtk_tree_view_column_get_clickable
 gtk_tree_view_column_get_expand
 gtk_tree_view_column_get_fixed_width

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 43cdce1cc127e4afaa3fe6cb9947799bf43e83c2..6add539de815c24f13286e60e2e36b16cf20efe6 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1053,7 +1053,9 @@ gtk_cell_view_set_background_color (GtkCellView    *cell_view,
  *   g_list_free() when no longer needed.
  * 
  * Since: 2.6
- */
+ *
+ * Deprecated: 2.18: use gtk_cell_layout_get_cells() instead.
+ **/
 GList *
 gtk_cell_view_get_cell_renderers (GtkCellView *cell_view)
 {

diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index c07f24960cc1a3d859a5c2f38a7db119d4611f65..73de84e191af0f351fc535dcf959dc7ad161d8d6 100644 (file)
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -72,7 +72,9 @@ gboolean          gtk_cell_view_get_size_of_row         (GtkCellView     *cell_v
 
 void              gtk_cell_view_set_background_color    (GtkCellView     *cell_view,
                                                          const GdkColor  *color);
+#ifndef GTK_DISABLE_DEPRECATED
 GList            *gtk_cell_view_get_cell_renderers      (GtkCellView     *cell_view);
+#endif
 
 G_END_DECLS
 

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 24f99e4c155660ec989b68dd3203785d984d0d33..bf98fdf1ad08b03f729f0fb68798c3fff2528ee7 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1548,6 +1548,8 @@ gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column)
  * in no particular order.  The list must be freed with g_list_free().
  * 
  * Return value: A list of #GtkCellRenderers
+ *
+ * Deprecated: 2.18: use gtk_cell_layout_get_cells() instead.
  **/
 GList *
 gtk_tree_view_column_get_cell_renderers (GtkTreeViewColumn *tree_column)

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 9238a623ce395bad0f3045ad03dcd257bf151f3e..b06e845d9fe9c115693fb36bc82c9fd08de60911 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -135,7 +135,9 @@ void                    gtk_tree_view_column_pack_end            (GtkTreeViewCol
                                                                  GtkCellRenderer         *cell,
                                                                  gboolean                 expand);
 void                    gtk_tree_view_column_clear               (GtkTreeViewColumn       *tree_column);
+#ifndef GTK_DISABLE_DEPRECATED
 GList                  *gtk_tree_view_column_get_cell_renderers  (GtkTreeViewColumn       *tree_column);
+#endif
 void                    gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  const gchar             *attribute,